merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:15:12 +0000 (15:15 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:15:12 +0000 (15:15 +0900)
commit4b1c0d68bcdbd4bd16d1ddc488261f511d95e74d
tree37b207b4a699cfda889f5fa4a0ae18f26053f914
parent5026224adafdb8401f06cb247e5b5e93e35ea13b
parent0e205e10e303d596a8fa255677046be581a7370e
merge trunk